Improved Piece Control